Warn if the icon cannot be loaded. (#323504, Kjartan Maraas)

2005-12-14  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkdnd.c (gtk_drag_set_icon_name): Warn if the icon
	cannot be loaded.  (#323504, Kjartan Maraas)

diff --git a/ChangeLog b/ChangeLog
index 8f93318ec2c51f4b7140473c2d5aeace4244f76f..fd913b6e6ee1481b36c6b56b5e34de97bd4c455f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2005-12-14  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkdnd.c (gtk_drag_set_icon_name): Warn if the icon
+       cannot be loaded.  (#323504, Kjartan Maraas)
+
        * gtk/gtktreeview.c (gtk_tree_view_class_init): Add docs 
        for the row-activated signal.  (#324044, Davyd Madeley)
 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 8f93318ec2c51f4b7140473c2d5aeace4244f76f..fd913b6e6ee1481b36c6b56b5e34de97bd4c455f 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,8 @@
 2005-12-14  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkdnd.c (gtk_drag_set_icon_name): Warn if the icon
+       cannot be loaded.  (#323504, Kjartan Maraas)
+
        * gtk/gtktreeview.c (gtk_tree_view_class_init): Add docs 
        for the row-activated signal.  (#324044, Davyd Madeley)
 

diff --git a/gtk/gtkdnd.c b/gtk/gtkdnd.c
index 24b6f51211f0628cc8a3f761e2696e08125af1a9..9caa1a711abc1fb22c9eb31a28f27d2a8aea8a71 100644 (file)
--- a/gtk/gtkdnd.c
+++ b/gtk/gtkdnd.c
@@ -3050,7 +3050,10 @@ gtk_drag_set_icon_name (GdkDragContext *context,
 
   pixbuf = gtk_icon_theme_load_icon (icon_theme, icon_name,
                                     icon_size, 0, NULL);
-  set_icon_stock_pixbuf (context, NULL, pixbuf, hot_x, hot_y, FALSE);
+  if (pixbuf)
+    set_icon_stock_pixbuf (context, NULL, pixbuf, hot_x, hot_y, FALSE);
+  else
+    g_warning ("Cannot load drag icon from icon name %s", icon_name);
 }
 
 /**